Merge commit '48a1136c8b3000c651e8bcd86325acd1dce6e4ec' into nyc-mr1-dev-plus-aosp
am: 7bc2aebd53

Change-Id: I3de8f91b1c9d0160ec58be8347502769580e0159