Merge of partner https://android-review.googlesource.com/#/c/115665 Change-Id: I50235dc09be584165155019a70708377ca9688a0