am 35bd30b1: Merge "Merge commit \'bc6ecbf7\' into manualmerge" into klp-dev am: d2b36f0ae4

Original change: undetermined

Change-Id: Id8276aeebc6ab35fb6212e15671365e0cf433479