Merge a4883d5c9686815ab0d4e312c7fffee9c33ef222 on remote branch

Change-Id: Ieb2295ea4d166d7d8768009849be9ba98c407e95