Bug: 21693466 Change-Id: Ib6a7c0802e46e2f5feefa0b31b94dea5cad367d7 (cherry picked from commit b8f8c1d1)