Bug: 62078132 Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd (cherry picked from commit 45033a7e)