Merge remote-tracking branch 'aosp/master' into add-jdi
am: 3a164764fa

Change-Id: I8192a5b446dff38f5bbb6bbf88ba1f6d9f548d10