Cumulative patch from commit f89c32e63f71e66d7b55e284016762b603ae02db am: e466304 am: ef9ee13
am: afa2bbc7a8

Change-Id: I8bbffd97af5c950c50a4f3c8b795462a4ca0edf4