DO NOT MERGE - Merge RQ1A.201205.011 Bug: 172690556 Merged-In: Ibadc11be527c0fbc0bb69ff00faa5e7989b213c6 Change-Id: I84ff52aa1fbdd4815230a722a177fefbae64d284