Merge c2313c6fe6628fabc4aef4ddf81fb9d901e98a98 on remote branch

Change-Id: I21ab35b767141370dde5532c7f6ed22e88068aa3