Merging new changes from omni

Change-Id: I0d38cc4e60560908af5e594ed81615ea836d68aa
Merge "Merging new changes from omni" into du44