Merge changes I1360b7ee,I587f5f4d,I8cb26827,Ib8766a89,I952f4935 am: c979f25706 am: 60bfc95796
am: 5e12c9d738

Change-Id: I574408cdd26f1fd9a3c680cc81f1a15c4432a402