Bug: 17441123 Bug: 17814435 (cherry picked from commit f83c208b) Change-Id: I2065afe73b79a8d86404edee16e983625d902cdc