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

Change-Id: I1779a122f0a739d9ad44bd55b852318dcb79fca7