Merge "AML: update experiment id logic" into qt-dev
am: 72c16709ba

Change-Id: I651cb7da8975bed684f257b0ce931ee5c2279dbc