Merge "Address nit from aosp/1301317" am: 1894a79964

Change-Id: I2443c5da4b69bce693a39e894c41db5b25b6cf03