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

Change-Id: I58f36fb83d3007f8d879ca098b59b148e978d522