CM sync from 3.28.2014
Sync with CM 5-7-2014