Merge of https://googleplex-android-review.git.corp.google.com/#/c/764976 Bug: 22989588 Change-Id: I3a6b01ee80446e0955e2039f88a627d37ee6caef
Bug: 23186545 Change-Id: I82d8b6dc54ebe32ceb1ed997aaab3701ee7b6c4a