Merge in history of cedf84d3 into klp-dev. am: 9b9bd69b am: 819a7fac am: 744e3056 am: 055792d0 am: 5d555ea3 Change-Id: I0bd8c175d7570458a2bb82f2f5d86fdce078d3ac