Merge a2540d3ca9e73add4978957c265b5c0115f7dcec on remote branch

Change-Id: I3104e68fe274f73e506977cb779da07bb3d9a463