Merge fbe26f6abf0b63ab2115c9a0f70525ef63d0d340 on remote branch

Change-Id: If4494aa7b020d2e0a68a648b0b21bbffc2cb671a