add aosp fix

Change-Id: Ib7b88760bad7f2cc68fe1d70a6c8b6d3962397f5