This reverts commit c85c9c57. Reason for revert: Breakage should be fixed in ag/5457346 Change-Id: I1117bc81999022e147926f61d371bceec8d7a174