Bug: 28625060 Change-Id: If552ca8e1a0666d402b5f536699bf3fb09c1e324 (cherry picked from commit 9a279ef2)