Merge 47dd787740ccdf8c25750cb0dcee400a07eb394d on remote branch

Change-Id: I068ba997fb55cc8445a67a5469c6c8b953ce5456