Merge 68c5d9a38a6a8bd833321768fe862630fdbc482f on remote branch

Change-Id: I1c1d52b92216fb78f172ebb91d0e41763897b8e8