Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am: 1c0dba50 am: 80a0f290 am: e274cd7a am: a8441ebf Change-Id: I4af0cf2638717eb91d82e804dddb69e647e713f0