Merge remote-tracking branch 'origin/dev/darcy-bringup_merge_on_rel-24' into my_rel24
Daniel Fu [Thu, 12 Nov 2015 22:17:49 +0000 (14:17 -0800)]
Change-Id: If80e00de082a42a5791c88c71c72d3cfef47bddf
Signed-off-by: Daniel Fu <danifu@nvidia.com>


Trivial merge