Bug: 27893309 (cherry picked from commit d19dc468) Change-Id: Ia9968b95dcc0d2c7c209be3ba4f65b6a8adfe688