Merge "Address review comments from change 000e1885." am: 2ab98309 am: 84fd87a9 am: e1e530fe am: 40ca8688 Change-Id: Ic9e5b86593eb65d08c1066a2428b13f85169cb79