Merge ba75291db5aa7ad344e5bb4cef4bb8773f3475d4 on remote branch

Change-Id: Ic6a7fc6d82e50b41d427acff9004ef3a51419a68