Bug: 6568834 Change-Id: If48635ead60dc119656f1b10c9b05a1918ebd668
Bug: 4460018 Change-Id: I08a9b556720f6c4f7089a8838c0869c9f88f479c