Should be merged along with Ib66f4614285411e5fd971dc0cb4291ea8113418c Bug: T189982 Change-Id: Id9beb08ee34e6861543cf59d80abfac616bf9238