This reverts commit e49bc9478a. Reason for revert: to be merged with ag/18185769 Change-Id: I746f0b2fc5094653a373835d0c2d048bcca54ae5
e49bc9478a