Merge 'aosp/idea133' into 'aosp/master'

Get stabilization fixes into the refactoring branch.

Change-Id: I7b6896c342f0a1127627e754c77b8f22b56d7953