Merge "Merge "Address remaining comments on aosp/1607893" am: b9650d8975 am: 5cb76b50f3 am: 6b91687abf" into sc-dev