Bug: 27298560 Change-Id: Id826426fc81458ad66118bf7b2059a7a6f02a047 (cherry picked from commit a48ea364)