default: merge in from aosp

Change-Id: Ib18880546024dd7b9971a0fd5450c03d05a30ae1