This reverts commit 99aca97d. Change-Id: Ib8284f5a5171ef6e73d49fa32cf344012b58420d CRs-Fixed: 2467251