Bug: 10029252 Bug: 10028759 Change-Id: Iea9cc1b7cafa97280503b0236b005cea57ba2c3d
Bug: 10028759 Change-Id: Id1bf030a9928124ead695aa7bf76db48ca58de4b