Merge de1c63f3a7ac14a5a682f55445b522c19e649453 on remote branch

Change-Id: Ia1744bd116d550e5678eb128e98c1f485494f07a