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

Change-Id: I4540995519a307daec0e2226d9607fbfadae0795