Bug: 26987597 Change-Id: I1b0bf711c642f4b8a7fe56f0cd27496761db4147 (cherry picked from commit c7f7712a)