Merge remote-tracking branch 'aosp/nougat-dev' into HEAD