Merge changes from topic "update-prebuilts-r18b" am: da199e2099
am: 23a0d7bbb6

Change-Id: I643da153bada50145e1e19a11099efae9ebf337f