Merge changes from topic "am-e89128d31a184fc8b0bb621180b3887c" into cw-f-dev
am: 1631745a2b

Change-Id: I4f259b68be9a92843e7d99d39795a4933d8fdc73