Bug: 27902359 Bug: 28218530 (cherry picked from commit 713a8e36) Change-Id: I63c0cc53287d414ae6accd03c191f3474c02fc82