Merge 71ebbee24d93dda9944593b1155d7dd75ad39e04 on remote branch

Change-Id: I77b454e03447be7f1e0689fae5e411f6952792c3