This reverts commit 03f4279d. Reason for revert: Commit without code change Bug: 147027868 Change-Id: I17e0ef63bca4893faab5bbe78f199174abb49db6