Incremental squash-merge of aosp/dev to aosp/master am: 2cbe93a352 am: 55f81b6782 am: dfebe85a1b
am: e5ef21549e

Change-Id: Ib33a5b3508de7fae9dfd127ca8761de86e5baabe