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

Change-Id: I97a36920786bfbaa6939752f012d8c1b61145d05