Merge c198200e6f4a2caaa1d166a8a564c7f622896332 on remote branch

Change-Id: I5685bb6f6d7e130c0408ce8019637bb50176419d