DO NOT MERGE - Merge RQ1A.201205.011 Bug: 172690556 Merged-In: I188b191659fcca9f7319e8fff40031f8af37c715 Change-Id: Ic9f996f0b5190c5451b8c6add9c7482903dbb485