Bug: http://b/20139821 Change-Id: I1c1ed1b97a75936407e996698b98b94a7175ac30 (cherry picked from commit 6cda074289)
6cda074289