Merge bb3b70629424e5481fcdf3479fb09e0cb8ffbc7a on remote branch

Change-Id: Ia4d907118fb164c729d8f8fc29aeba22a2f2b5ac