Related-Bug: #1589956 Change-Id: I17ae387efdf1f271fc236931b6eb6495b541b7d7 (cherry picked from commit 459a1be121)
459a1be121