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

Change-Id: Iedad009e2a2b77cfe90011cab58e3ff198706a07