Merge "[SP16] Address comments on aosp/1172143" am: fc9e4fbc08 am: dfb6a0fdb9 am: a08cdb380e

Change-Id: I4cff4d096f375210585ceae5eb27002b97a35226