Change-Id: I82621f6151909e907892151f584f98918e4aaf3a Related-bug: 1551136 (cherry picked from commit 08a857b17c)
08a857b17c