bug:28460178 (cherry picked from commit 1be7cbd5) Change-Id: I9a84af048600a4653af284a9b171c2ba4c4dcca5