Merge "Address comments from previous change (320592)" am: e7cb6c3761 am: b6f606b59f am: 454a408717
am: 430b1ff0f0

Change-Id: I488ec47172c48f2965b33fc484a26f395aa48a29