Merge remote-tracking branch 'l-mr1-release' into rel-st8-l-partner rel-st8-l-r4-partner rel-st8-l-r5-partner rel-st8-l-r6-partner rel-st8-l-r7-partner
Roger Ma [Tue, 24 Mar 2015 13:09:44 +0000 (21:09 +0800)]
Change-Id: Icf781a0d77107f056384ec402f3fe13543611189


Trivial merge