Manual merge of https://android-review.googlesource.com/70831 across the header refactoring. Change-Id: I28b6a61e89b68d914124122882976a9d2f81a609
Manual merge of https://android-review.googlesource.com/70831 across the header refactoring. Change-Id: I28b6a61e89b68d914124122882976a9d2f81a609