Merge "Update runtime hints for master and Nougat"