This reverts commit 4c36c290. Reason for revert: Compilation failure in Arc++ fixed. Bug: 77297012 Change-Id: Ic707f7256e8d7430c28e58085c6c2208f88042f2