9a8c9aa687
Bug: 150864182
Bug: 151050221
Change-Id: I29ba2ef66b4359a47f866d02306498537c45236e
(cherry picked from commit b365cc4387)