Merge branch 'update_external_module_example-rel' into release

Change-Id: If6d31f4d31afad729c2611c0959d8962f84980d5
Merge branch 'release'

Change-Id: I40b6e785adc4f2062dd64333b89e5c4f70035773