This reverts commit 702fb3bd. Reason for revert: Build breaks in some branches Change-Id: I3502b86d1a2e1afd6bc32e02287cd903bad7b9b2