Manually merge changes from giant AOSP topic

Change-Id: I50772da89aad631a30c739f9d44160a8d0fc7d12