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

Change-Id: I374c8c63e4fb3310c3c50cc531a65005991c2fe2