Merge changes from topic 'am-588c4b19e0964a4f9dcb9875e12578e2' into nyc-mr1-dev-plus-aosp
am: 64a09b3791

Change-Id: I8cdbfbe1c4f2fb6555c0aa35a8783ec234f4750f