Manually merge changes from giant AOSP topic

Change-Id: I00f03fe10e21f05576b7ed0910275e1a58ba8882