bug: 18235329 bug: 15476051 (cherry picked from commit f412a780) Change-Id: Ie39e9e014075331aaf5c6b27212fdfdfc42e0380