f3b22ffee6
Test: Tested locally
BUG: 150688842
Change-Id: Ifa96bd01363de47cf1d8cdce34d81d525c8c2c04
(cherry picked from commit 9b90b1b034)