Merge "Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 654b0fff am: d319fef0 am: 07d4708a" into sc-dev