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

Change-Id: I179a547e050affc14f1010139704af966d3fe441