Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into cw-f-dev
am: bfc21dd3df

Change-Id: I8bef60e5095aa1478c00e2caf46692030f344815