DO NOT MERGE ANYWHERE Manually Cherry Pick AOSP change to resolve conflicts.
https://android-review.googlesource.com/#/c/151358/

Change-Id: I190eeb8f17d29eb451e741ce7e11f61c95c66f1e
1 file changed