Merge branch 'external-modules-rel' into release

Change-Id: I8f5dcabc7a9c6aaef26e897e337b23d0ee1fa9f2
Merge branch 'release'

Change-Id: I0ffa81dd530552a24f91fea493ba821016fde6d8