This reverts commit e630cfaaa9. Reason for revert: align with ag/17935513 and ag/17935512 Change-Id: Ie2fff80785a0c7acee75d30cac9bf3b4f31699d2
e630cfaaa9