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

Change-Id: I81d3cd0f3eb152dcab9ebd6861fc4d053bbfc1cb