Revert "Update for 5.1 Release" This reverts commit 4d86586ab0ff60e29ea9e0bec08e31b8fa42c9cf. Change-Id: Ied11fb62072ace75df1f2aeb38bc2c12601260ac