DO NOT MERGE - Merge Android R QPR1 Bug: 172690556 Merged-In: I84ff52aa1fbdd4815230a722a177fefbae64d284 Change-Id: I2bdc033deb66f838746c6ca64cc4dce3a9bc7d90