Merge "Update runtime hints for master and Nougat" am: c29c5a7b35 am: d25e6dcca6...