Bug: 27145639 Change-Id: I80cf2971d803a3366a63caa3612a503a88639040 (cherry picked from commit a4ad5f84)