Bug: 63756964 Bug: 74245837 Test: untested (cherry picked from commit 28c4c9b0) Merged-In: I47a0fbab7da9cd87ec9e7dc03b2bc00e5668eae3 Change-Id: Id126490847c2601bb1584c43147acc89dc8baeff