Merge changes I1539580e,I8452e799 into pi-dev am: 8ea760c815
am: f0013528bc

Change-Id: I662b167e13ed386290dc802988b3225a60a67fc0