Cumulative patch from commit f5728d0a82d5c5fb5347e41ce761fdf4a79772ec
am: 58d12adcdf

Change-Id: I098230f3db85cfb70bcdc8b2224beb59596167e0