tree 93476ab37fc4a75248a507818caf80b42ece54cd
parent 5fafd21b1f15930b729f067be7d2c584add3217b
parent 046f3843f10f076b5df2fe58f8f15a456e6bb6dd
author xinhe <xinhe@google.com> 1416425974 -0800
committer xinhe <xinhe@google.com> 1416426523 -0800

resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE)

The change is already in MR1 branch

Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff