Bug: 26914975 Bug: 27599828 Change-Id: I1641a44e860901d2aab83138e47af6dad3ad87b1 (cherry picked from commit 6cbdc339)