Merge "Removed C-style casts" am: 110155a604
am: 6a831e02b6

Change-Id: If512cbe096ad18388fea2800d12182832d0ecda8