Merge changes I7a39770c,Ia0c1d81c into jb-mr1

Change-Id: I05f7c5f61e974aee9768878350ef6c02841edb4a