Manually merge changes from giant AOSP topic

Change-Id: I7d3c3790c44c3d2bb8346c1edc5ff402ce78938b