Revert "DO NOT MERGE resolve merge conflicts of...
Revert "DO NOT MERGE resolve merge conflicts of 3604fffb to rvc-dev-plus-aosp"
This reverts commit de9b76db.
Bug: 151320608
Reason for revert: culprit for Bug 151320608
Change-Id: I678debb5cdef25a805ef6db5491283198d078fb8