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

Change-Id: Id6d4be756ec4bd6d3e9c7b8fa1d85b3bdc802a10