Merge 89c3378e0ef8e9fe5c4b2ba9e79ac401177dc164 on remote branch

Change-Id: I63f5c0b5b12bf7f81ecd8f29655742ddf9abedf0