Rebase to master@68888117

Change-Id: I2fad5854828d3986bef98655abbfa321e62fc2dc
Exempt-From-Owner-Approval: rebase
BUG: 160122832