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

Change-Id: I5b8d766f4d5b6675613c10b73ebf1b36c35da51c