Merge 240a5a28559c5fd2e5fc54ec5bd77d73bcf9e9ea on remote branch

Change-Id: I4a9b850e1bf061438d7812f5eccc5d78473ce13b