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

Change-Id: I881ceb928c0cf8663b0de5f2451846bfe39f2090