Merge changes from topic 'pixel-c' into nyc-mr2-dev
am: dee514fae3

Change-Id: I4038d1fbd429fcedc4a379d764b5ef5c59dcce1d