Merge remote-tracking branch 'aosp/nougat-dev' into HEAD am: 1cc3e67bf6 am: 0ad3b364ae
am: 3c61945593

Change-Id: Id792b3777b7f383709354a180189f8d10c224ec2