Merge changes from topic "ext" into rvc-dev am: e2a128a901

Change-Id: I28820687c5763b0ad389e4fcae7220095e13ebf6