Merge dbb19355a2626a5a2fa6f0a1f349dc28ec540326 on remote branch

Change-Id: I736bc7223ea98a4960990d80a6b42ca5699153ab