9185e04f72
Bug: http://b/19059885 Bug: http://b/21203348 Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465 (cherry picked from commit 69a5fb951d69689dedd83cb033ae3dcd0ef05b65)