c9676e20d3
Bug: 189807374
Change-Id: I529dba5d4df3d0c3366c111e70991a36bec4bfc3
(cherry picked from commit 0bd0733ef4)