Merge changes Idca52b94,I82ae308d into pi-dev
am: bb96c13c70

Change-Id: Ie83ef01646ededb9eab85c6418061aa64b4c1ed3