Merge "Remove duplicate item and bump the version" am: 76756cfa83 am: 1165765a1c
am: 0d7cbfaa4c

Change-Id: I6ca7183f8ee797ec3764a18be2ee00238326ccbf