Bug: 19995360 (cherry picked from commit 0cab5e68) Change-Id: I17868bff2a701dc25291d41b9732c6b86f92be08