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

Change-Id: I2b9232f9656876fcc55615905e4056c2ac0fd138