This reverts commit 4b154fde. Reason for revert: Build failure Change-Id: I3c1da269d6eab0121eb2d9dff87e0a4d73368bc3