This reverts commit 3bf31401. Reason for revert: Build cop revert because this change is breaking Blueline builds. Change-Id: I54f87f21eec0e93873ffedec6b0bbe154584ba4b