This reverts commit 810c4ac244. Reason for revert: Need app fixes first Change-Id: I1fea9a2ca8d57ef79a4f407bbc0d906976292eb1
810c4ac244