Merge b91a666e48f58d0466af1927b7da2ba1fd4ca064 on remote branch

Change-Id: If06dbeb0a751a7597ba7e87ef9d28cc187f62099