Merge in history of cedf84d35ab127dd24f9bcbf8b8339518d0e8928 into klp-dev.
am: 9b9bd69b65

Change-Id: I2252eddc4a425ca9cd550ce1d69fd5859428620d