Bug: 20204101 Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb (cherry picked from commit 19a7b546)