(cherry picked from commit f7e7327d) Bug: 22136903 Change-Id: I657d4b5e623696e1264c2c6c9ad4e7fd466d759c