Merge "Address aosp/1274403 leftover comment" am: 033bccd3 am: e87bd7b8 am: d4aeba60 am: ea70dbf2 Change-Id: I3cfca08a475c2d0a8cc157011c41ce5a2d8f89ee