Merge of https://partner-android-review.googlesource.com/#/c/186263 bug: 18279011 Change-Id: I6d4482827b17ea671a4bd73ab79486583a83fcbf
Merge of https://partner-android-review.googlesource.com/#/c/186263 bug: 18279011 Change-Id: I6d4482827b17ea671a4bd73ab79486583a83fcbf