Bug: 15345057 Bug: 15426766 (cherry picked from commit 8508a436) Change-Id: Id710c87c050f573fec1e4c36f06f88def5de5887