Cumulative patch from commit f5728d0a82d5c5fb5347e41ce761fdf4a79772ec am: 58d12adcdf am: f857d02690
am: bcaf135496

Change-Id: Idaba4522620e7c121fc2f3f8baadaf61596ee5ba