Bug: 6567492 Change-Id: I78d56ec05b7711749553c6787a9abb1351dff4db
Bug: 4460018 Change-Id: I08a9b556720f6c4f7089a8838c0869c9f88f479c