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

Change-Id: I9c826c08320e112466dea0d2628f3447ebcb7d02