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

Change-Id: I8bfff054a4efc083f715304fbb46052686e6b123