Bug: 36635931 Change-Id: Ib279354a345a89bdf1a3c9e20e8d951cc0e17fdf (cherry picked from commit 725b2659)