Bug: 16808603 Change-Id: I39ce0ed8b5580754dfd0cf1494289b0a23863d50
Bug: 15782668 Change-Id: Id2ae47cfb2065d73f13701b9c6a041129dfd08ae