Merge with upstream-master

Change-Id: Idee6f8eed7cc2646074cafb5e88ed808607b8fc4