Merge eec637f7f728840c73a7a98818f98cc1c9eccb55 on remote branch

Change-Id: I03476faeaee736cc1a87fa39aabc4af908def233