Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ed9d1ca5 am: b80ef473 am: 16a584a6 am: 5a8be7ee Change-Id: I7b17681c5381aaa00a5f6e38c6f6d186324b41d1