Bug: 30349182 Change-Id: Icb94db6a8c146db7d4e63108cb19b16ea438f212 (cherry picked from commit 33290100)