Merge commit 'cb8b5af' into nyc-dev-plus-aosp
am: 3587c22e55

Change-Id: Ife0d09d14b4244bfc0c42d79653032b84a1e5c52