bug:20715803 bug:20690906 (cherry picked from commit 5d7b7f81) Change-Id: Ie55739601b8d6fedc830d6e19d8a053392047d34