Only affects OEM integration tests, not production code. bug: 15600077 Change-Id: Id534cec663366f639d934baf8d366615a2d97b64
For bug 4245169 Change-Id: Ie110d5603f19cd54878d2c4506e8ffad11207f10