Merge 19cdf06e712024c0c23dbac7a38f216047eae1dc on remote branch

Change-Id: I03cb632a27bf0d1fc5c33236eb5bd189f6abf66e