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

Change-Id: I318efe59e1967150338a7bd8001c27d9ebe3cf75