Merge e625542e75e248c9e598444c69518b040d993322 on remote branch

Change-Id: Ie2bdea6df55f1fd93978d6e64c7a510219331cdf