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