Merge commit '2ad3ed6' into nyc-dev-plus-aosp
am: 2843a39cab

Change-Id: I84623ef70fbbcb5e7bd51aa987602bf282705ef2