BUG=aomedia:1348 BUG=aomedia:1347 BUG=aomedia:1345 Change-Id: Ibe94d826b06e44e4ffad5a6ddc24f962b889ae17