Merge "Merge "Address remaining comments on aosp/1607893" am: b9650d89 am: 5cb76b50 am: 6b91687a" into sc-dev