Merge 5709e5656e50e7c95e0bce9d8ed548c96677a874 on remote branch

Change-Id: I2112c5d83c543f6eeb1f57915d6e2145a4b6da4b