bug:14609275 bug:15500275 Change-Id: I62c99835e33fdb5a6a5979685469dfe6d51bb74e (cherry picked from commit 922c6a30)