Merge 5483345d9cc0782aaaca5b6d6d84add35be42b94 on remote branch

Change-Id: Ic64dcaa0946a008ae20469e740a811200c9f34a4