(cherry picked from commit 5562fb8d) Bug: 28869570 Change-Id: I413da53ec8764b0e4876676a2609627a80f289c6