Merge "Address nit from aosp/1301317" am: f0edf03f5b am: b1f5f8d5fe am: bb72b5360d

Change-Id: Ib5bb0a7349523274f825832a7fc71aa9ed95b764