Bug: 27914456 Bug: 27937568 (cherry picked from commit 28530daf) Change-Id: I072c4e41a5c0fc7941808109ec2f6fdd49130793