BUG=21705832 Change-Id: I400b5402c0efd34d79be3e8b05b2154dd8c48735 (cherry picked from commit 032c283ef32f72d038b8a989366b184d68ccfd0e)
BUG=21705832 Change-Id: I400b5402c0efd34d79be3e8b05b2154dd8c48735 (cherry picked from commit 032c283ef32f72d038b8a989366b184d68ccfd0e)