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

Change-Id: I1b1b69290d7a868e424d8c0e162678288ee47191