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

Change-Id: I2e970c5ff13d42656cd7df66da1ae32a1d4d3306