Merge \"Purr. am: 610f6ede25 am: 0e792f567a\" into nyc-mr1-dev-plus-aosp
am: 3d32cf6477

Change-Id: I9e11509f40c1d62b5e9a0b8f5ea30024b8279e18