BUG=aomedia:659,aomedia:695,aomedia:705,aomedia:706 Change-Id: Iba60166370362599f3f4ef7959a6304bf079857d