Merge "Merge "Fix Automated API Review issues." am: 43c1ade661 am: 9e3f29037b am: ce18c5a1ec"