Related CL: https://android-review.googlesource.com/#/c/38651 Change-Id: I425e06f08fda90501a686c7e437d4e70fc1e4a1b