Bug : 63440751 Change-Id: I2180e698ac5751dab816f538bacdc7a965d54389 (cherry picked from commit d8cd7d32)