Merge 5782e4fa2f04ab7a56490e0ae3db9c24d565863a on remote branch

Change-Id: I9f4c9ca5c4c07a2f00918d1529d2a9bee194a42c