Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ed9d1ca52d am: b80ef47305 am: 16a584a67a
am: 5a8be7ee63

Change-Id: I7b17681c5381aaa00a5f6e38c6f6d186324b41d1