Merge "adding mapping in update_current for merged material aar" into pi-dev
am: c7a198b48e

Change-Id: Id0e099e3778f31366653179ed7fcc3431302b705