Manually merge changes from giant AOSP topic

Change-Id: Idac958c996e3ac2bad36c3ca157b76ab2d021b99