Merge ff3984371a526c54c087e02f41fca67ba7721bb0 on remote branch

Change-Id: Ieb1f0684ef512b730983d98c4ca09410e102d448